bitkeeper revision 1.1159.170.16 (4195ddd7jxD5QzxBsPmmTAdBS9rikw)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Sat, 13 Nov 2004 10:11:35 +0000 (10:11 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Sat, 13 Nov 2004 10:11:35 +0000 (10:11 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk


Trivial merge